Stupid MSVC still doesn't accept C99. Dumb down for it.

diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c
index e122eccf782bbd81051e61e743e2f999c83f52ab..022b147569f1f3ca20cd4c40a5306ad3a4aaec25 100644 (file)
--- a/gpsbabel/gdb.c
+++ b/gpsbabel/gdb.c
@@ -110,8 +110,8 @@
 
 /*******************************************************************************/
 
-/* static char gdb_release[] = "$Revision: 1.73 $"; */
-static char gdb_release_date[] = "$Date: 2010-10-18 13:29:25 $";
+/* static char gdb_release[] = "$Revision: 1.74 $"; */
+static char gdb_release_date[] = "$Date: 2011-04-14 01:30:01 $";
 
 static gbfile *fin, *fout, *ftmp;
 static int gdb_ver, gdb_category, gdb_via, gdb_roadbook;
@@ -1327,7 +1327,7 @@ route_write_bounds(bounds *bounds)
                FWRITE_DBL(bounds->max_alt, unknown_alt);
                FWRITE_LATLON(bounds->min_lat);
                FWRITE_LATLON(bounds->min_lon);
-               FWRITE_DBL(bounds->min_alt, -unknown_alt);
+               FWRITE_DBL(bounds->min_alt, -(unknown_alt));
        }
        else FWRITE_C(1);
 }

diff --git a/gpsbabel/mmo.c b/gpsbabel/mmo.c
index d2ac2f77c03bb5ddfb87c1808add80d43b1ebc59..a36859997e79b439eb0dc5b412585f12a88704ba 100644 (file)
--- a/gpsbabel/mmo.c
+++ b/gpsbabel/mmo.c
@@ -367,13 +367,13 @@ mmo_read_CObjIcons(mmo_data_t *data)
        const char *sobj = "CObjIcons";
 #endif
        int icon_id;
+       gbuint16 u16;
 
        DBG((sobj, ":-----------------------------------------------------\n"));
        DBG((sobj, "name = \"%s\" [ visible=%s, id=0x%04X ]\n", 
                data->name, data->visible ? "yes" : "NO", data->objid));
 
        if (mmo_version >= 0x18) {
-               gbuint16 u16;
                u16 = gbfgetuint16(fin);
                DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16));
                u16 = gbfgetuint16(fin);
@@ -383,7 +383,6 @@ mmo_read_CObjIcons(mmo_data_t *data)
                u16 = gbfgetuint16(fin);
                DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16));
        }
-       gbuint16 u16;
        u16 = gbfgetuint16(fin);
        DBG((sobj, "unknown value = 0x%04X\n", u16));
        u16 = gbfgetuint16(fin);
@@ -788,10 +787,10 @@ mmo_read_object(void)
 
        objid = gbfgetuint16(fin);
        if (objid == 0xFFFF) {
-               DBG(("mmo_read_object", "Registering new object type\n"));
                gbuint16 version;
                char *sobj;
                int len;
+               DBG(("mmo_read_object", "Registering new object type\n"));
                
                objid = mmo_object_id++;
 
@@ -824,12 +823,12 @@ mmo_read_object(void)
                data->name = mmo_readstr();
 
                if (objid != cat_object_id) {
+                       gbuint32 obj_type;
                        data->ctime = gbfgetuint32(fin);
                        data->mtime = gbfgetuint32(fin);
                        data->locked = gbfgetc(fin);
                        data->visible = gbfgetc(fin);
 
-                       gbuint32 obj_type;
                        obj_type = gbfgetuint32(fin);
 #ifdef MMO_DBG
                        gbuint32 expected_type = 0xFFFFFFFF;